Merge "Code coverage using JaCoCO"