Merge "NonCentralizedAppException-junits"